Merge branch 'master' of RISCI_ATOM/libreCMC into master