some more updates
Merge branch 'develop' of https://github.com/mishraankita/INSE-6260 into develop