Fix Issue#319
Fix test cases
Merge branch 'master' into Issue#319
Merge pull request #370 from Catrobat/Issue#319

Fix for Issue#319