R and D Over converse js
Merge master lastest code