Merge branch 'spi' of https://github.com/theolind/mahm3lib.git into spi
Merge remote-tracking branch 'origin/spi' into spi_2