Merge pull request #146 from hevey/master