Merge pull request #40 from ajohnstone/master