#5 small fixes
Merge branch 'master' of github.com:IvenZ/htwplus