* Integrate meta-model changes to adress bug #167
 fixes #167
 closes #167