some small fixes
Merge pull request #2 from rahiel/master

some small fixes