fixes #18
Merge pull request #65 from BillMills/master

fixes #18