Resolved bug 1122
Resolved bug 1115
Resolved conflict
Merge pull request #47 from priyanka-techmaes/develop

Develop