changed to not depend on deleted module
Merge remote-tracking branch 'origin/master'