Fix/commonjs

Implementing @spions recommended changes