did some of m6
Merge pull request #5 from inderdhir/inder

did some of m6
Merge pull request #6 from inderdhir/develop

Develop