Possible fix #38
Merge pull request #40 from maxthomas/master

Fix #38