fix and log
merge
Merge branch 'monetique' of https://github.com/MIWA-ST/MIWA2014 into monetique