Develop

After some struggling with git finally a clean pull request for BOD settings ;-)