cm 7 updated, some changes still needed
Merge branch 'master' of https://github.com/blegat/LINMA1691