Core update
Merge branch 'release-0.2' of github.com:shumer/NG-new into release-0.2