Update notes for submitted changes

* Merge branch '0.4.x' of ssh://pomelo.com:29418/pomelo into 0.4.x
* resolve conflicts
* fix bugs
* Merge branch '0.4.x' of ssh://pomelo.com:29418/pomelo into 0.4.x
* fix bugs