made all the changes mentioned in the PR
Merge branch 'master' of https://www.github.com/prashant1993/naas