New stuff added

TODO
Cleanups
Merge branch 'master' of https://github.com/RCyberW/Weiss_Schwarz