fixes based on feedback
Merge pull request #35 from antonow/feedback-fixes

fixes based on feedback