Small fixes

+ small fixes
Merge pull request #97 from Peda1996/master

Small fixes