Fixing Bugs
Merge branch 'master' into openshift