Add support for using the module as a nested module and add some missing comments
Merge branch 'hotfix/1.1.1'