Add the ihm and modify the core
Merge branch 'master' of https://github.com/Niiner/Nikouli-Makouli-Project