please merge joerghoh-master

My own master branch contains all changes I consider as relevant for a release 1.0. It is also up-to-date and contains all changes of the other branches:

* 4-defaultContent
* 27-long
* 30-non-available-mbeans

please merge.