Merge pull request #3 from joehoeller/dev

Merge pull request #2 from joehoeller/master
Merge pull request #4 from joehoeller/dev

Dev
Merge pull request #5 from joehoeller/master

fixes