Fixes #69
Merge pull request #77 from troymccabe/master

Fixes #69