fixed module loading
Merge branch 'dev'