Merge branch 'integration' of https://github.com/theolind/mahm3lib.git into integration