Pull updates into mah fork