More generalisations
Merge branch 'master' of https://github.com/dirkjankrijnders/mm1acc