Merge pull request #1 from manpreet50/OMS

Oms PUll Request conifmraed
Commit to master for testing of merging
Doing commit from GIT GUI - ammended
Merge branch 'master' into OMS