Update notes for submitted changes

* update readme
* merge 0.7.x & fix conflict