CommonJS Modules/1.1 rebased

See #179 for details