Merge pull request #5 from joehoeller/master

fixes
Merge pull request #6 from joehoeller/dev

Merge pull request #5 from joehoeller/master