Fixes #18, Fixes #19
Fixes #18, Fixes #19
Merge branch 'master' of https://github.com/OFFIS-Automation/Framework