Merge branch 'hotfix/22'

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

Various fixes
Merge branch 'hotfix/23' into develop

Forward port #23