improvements from review
Merge branch 'master' of http://github.com/delsener/ch.zhaw.softwareprj2