small fixes
Merge pull request #30 from gioman/master

small fixes