Merge branch 'dev'
fixed module loading bug
Merge branch 'master' into dev