Merge pull request #144 from hevey/master