Merge pull request #187 from chrisdew/master