fixes from code review
Merge pull request #27 from kevgo/fixes2

fixes from code review