More changes 3 from another.
More actual changes 3 (another).
Merge branch 'master' of https://github.com/nd01/cm1101