added some modules previously missing
Merge remote-tracking branch 'origin/master'