Merge pull request #4 from ningosi/master

Reduced code duplication
Intial OCM-3 work
OCLM-7 Save OCL Concept
Merge branch 'OCLM-3'
Initial work on OCL_3