Merge pull request #5 from ecsoftware/sprint0

Shudhanshu_First