fixes #262
fixes #255
Merge pull request #266 from Catrobat/issue-#255

fixes #262