Added ability to pre-register a module.
Merge branch 'develop'