changes
after cod review
Merge branch 'master' of https://github.com/AhuraLab/Mozaic