small fixes
Merge pull request #1 from Furniel/master

small fixes