Fixing STRATOS-849
Merge branch 'master' of https://github.com/R-Rajkumar/stratos. This closes #74