Merge pull request #3 from ding2tal/core-pr-4

Core pr 4
Merge branch 'master' into development