more stuff
Merge branch 'master' of https://github.com/emflem42/THIS-ONE