Fixed module initialization
Merge branch 'hotfix/0.1.8'