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