Progress to Issue #2
Merge pull request #3 from AdamBJ/bugfix

Progress to Issue #2