Core pr 3 (merge with Artesis)

* Updated coding style.
* Upgraded to features 2.x.
* Updated makefile.