Some bugfixes...
Merge branch 'master' of https://github.com/doczir/EIMT