Improvements.
Merge branch 'master' of https://github.com/htwchur/ch.htwchur.iuk_iii_w.orm.git