Closes #106
Merge pull request #107 from lloydbenson/master

Closes #106