Fixed getEdge
Merge remote-tracking branch 'origin/gameloop' into gameloop