Refactored
Merge branch 'master' of https://github.com/awltech/eclipse-optimus.git