#180 - getModule supports nested module ids
Merge CModule changes with recent master
Merge branch '180-getModule-support-nested-module-ids'