Bi more or less
Merge branch 'CRM' of https://github.com/MIWA-ST/MIWA2014 into CRM