[WIP] Progress on #187.
Fixes #187.
Added untracked file.
Merge pull request #201 from AshFurrow/master

Fixes #187