changed function signature
Merge branch 'master' of https://github.com/Blackout-0-/Shadowland