Fixed bug from merge, start of level 4
Merge pull request #28 from Gerb11/master

Fixed bug from merge, start of level 4