Various fixes
Merge pull request #23 from neeckeloo/hotfix/various-fixes

Various fixes
Merge branch 'hotfix/23'

Close #23