Basic modifications
Merge branch 'master' of https://github.com/KUK-DEVS/imremelo.git