Changes from another.
Merge branch 'master' of https://github.com/vaskogr/CM1101