Bugfix-003 finished
Merge pull request #2 from jeffbeck/feature/Bugfix-#003

Bugfix-003 finished