Merge branch 'mm-bug-hunt'
bug fix
Merge pull request #21 from amida-tech/mm-bug-hunt

Mm bug hunt
Merge branch 'master' of https://github.com/amida-tech/DRE-UX
Merge branch 'master' into dmitry-next-steps