Modules are now objects (idea Bouke #1)
Merge remote-tracking branch 'origin/master'