Update to newer ES6 module draft
Fixed #5