close #5, for js also
resolved merge conflicts