Fixed wierd interaction behaviour
Merge branch 'master' of https://github.com/ninjaDanzer/FakeWhaleTest