Small fixes

small fixes
Merge pull request #120 from Peda1996/master

Small fixes