ES6

@boennemann Please merge if ok