Merge pull request #38 from Geraldlim91/master

Complete Version in OpenShift