fixes from first round of testing
Merge pull request #6 from z0Yo/master

fixes from first round of testing