Merge pull request #100 from GeneChatham/bugfix

Bugfix