Fixes #200.
Merge pull request #202 from AshFurrow/master

Fixes #200.