ES6 version merged

First issue noticed by @Wingnut : ES6 version incoming