some fixes

some fixes
Merge pull request #23 from amtr/patch-7

some fixes