changing module name to avoid confusion
Merge remote-tracking branch 'origin/master'