Version 1.0.1
ES6 WIP