Merge branch 'master' into release
Merge branch 'release' into development
Merge remote-tracking branch 'origin' into release
Updated coding style
Merge remote-tracking branch 'origin' into release
Merge pull request #3 from ding2tal/core-pr-4

Core pr 4