Update notes for submitted changes

* Merge branch 'master' of ssh://pomelo.com:29418/lordofpomelo
* update license year