Fixed minor flaws
Merge branch 'enh/CaminoConMat'