small fixes
more fixes
small fix2
small fix3
Merge pull request #6 from vapolyakov/master

small fixes