renaming of variables etc..
Merge branch 'master' of https://github.com/KaiBrusch/BS