Fixes #76
Merge pull request #77 from buzzdecafe/master

Fixes #76