Fixes
Merge pull request #25 from hack4impact/fixes

Fixes