some fixes

some fixes
Merge pull request #22 from amtr/patch-6

some fixes