Bugfix-003 finished

Pulling frem master to master makes no sens.
Pulled from feature/Bugfix-#003 to develop instead