Merge pull request #2 from deyunanhai/development

Development
0.14 -> 0.15
Merge pull request #3 from deyunanhai/development

Development
0.15 -> 0.16