works now merge master and js-refacore