more minor fixes
Merge pull request #32 from moiseev/patch-1

more minor fixes