some fixes
Merge pull request #42 from amtr/patch-26

some fixes