Merge
Merge branch 'old-master'
Convert to ES6 modules