Fixes bug
Merge pull request #9 from jmdetloff/john/bugfix

Fixes bug