Removing nullpointers etc for #49
Merge branch 'dev' of https://github.com/oSoc14/Artoria into dev
Merge branch 'dev' of https://github.com/oSoc14/Artoria into dev
Got the radar back :D #49