Pull from upstream
Merge branch 'master' of https://github.com/martinabsmeier/maITCommon.git