fixed remaining merge issues
Merge pull request #25 from DryTuna/jon

fixed remaining merge issues