names changed
Merge branch 'master' of https://github.com/stephde/BS2
Important because Stephan added a lot.
Debuging