Fixes #67
Merge pull request #69 from triforce/master

Fixes #67