fixed some null pointers, now right hand must fixed
Merge branch 'master' of github.com:do3meli/Labyrinth