Merge pull request #7 from maheshj567/master

small changes from master
code changes for openshift integration
Merge pull request #8 from maheshj567/develop

Develop