extract proper module names for bundle
Merge remote-tracking branch 'origin/master'