fixes #155
Merge pull request #173 from tmcgee/master

fixes #155