Bugfix-002 finished
Merge pull request #3 from jeffbeck/develop

This merge was Easy
Merge pull request #4 from jeffbeck/feature/Bugfix-#002

Feature/bugfix #002