get es6 branch up to date #427

Closed damian0604 closed 6 years ago