minor fixes
Merge pull request #32 from Gegga87/master

minor fixes