Applied Stefan's improvement proposals and some other rework
Merge branch 'master' of https://github.com/joergreichert/mobilecloud-14-xtend