local changes from cpad
Merge branch 'master' of simon.psaux.de:home