fixes #138
Merge pull request #139 from Catrobat/issue#138

fixes #138
fixes #137
Merge branch 'scene-fix' into development