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

Core pr 3 (merge with Artesis)
Merge branch 'master' into release
Updated makefile to point to development branch and ding2tal
Resolved merge conflict with release branch