modify the license, and add some comments, by diwen
Merge branch 'dev'

merge some modify from dev branch, by diwen.