Merge branch 'master' into develop
Code cleanup
Updated to support latest npm packages
Merge branch 'release/1.2'