Moving to use init module part
Merge remote-tracking branch 'origin/master' into gh-pages