Updated virtual field to version 1.2
Merge branch 'master' into development
Updated make file to point to development branch
Updated make file to point to master branch
Merge pull request #3 from ding2tal/core-pr-5

Core pr 5