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

Core pr 3 (merge with Artesis)
Merge branch 'master' into release
Merge branch 'release' into development