iPerfected highlander decorator.
Merge branch 'master' of github.com:espressomd/espresso