bugfixed
Merge branch 'master' of https://github.com/ahaeff/ibsys2_p02.git