Merge branch 'master' of deniss-s/libreCMC into master