modified to inherit module instead of core
Merge remote-tracking branch 'origin/master'