Fixes
Merge pull request #8 from knightopress/master

Fixes