fix obvious bugs
Merge pull request #36 from AndrewKostousov/bug-fixes

fix obvious bugs