Add new-modules to github
Merge branch 'master' into new-modules