#192 made first changes to fix the strange bug
Merge branch 'master' of https://github.com/ccebinger/SWPSoSe14