Fixes #188.
Merge pull request #199 from AshFurrow/master

Fixes #188.