Feature: Additions to CommonJS PR 

Continuation of PR #1300 
This block is overindented. As per our style docs, use 4 spaces for indentation.