Merge branch 'master' into task_388
handling pull request comments
Merge branch 'task_388' of github.com:raniaashraf/mozzn into task_388