issue fixes from QA testing
Merge branch 'master' of https://github.com/tamojit/Mercury
changes related to bug fixing
Merge branch 'master' of https://github.com/tamojit/Mercury