Updated stuff - Gijs
Merge https://github.com/JeremyGee/S.E.G.O.R.A.T.A.
Updated stuff - Gijs