fixes #218 and fixes #226
Merge pull request #228 from Catrobat/issue#218

fixes #218 and fixes #226