Merge pull request #100 from GeneChatham/bugfix

Bugfix
Merge pull request #101 from GeneChatham/master

Merge pull request #100 from GeneChatham/bugfix