small fixes
Merge pull request #181 from Charizard/master

small fixes