Pull request for Core v0.2.1

All issues relating to Core v0.2.1 have been resolved. Pulling the 'dev' branch into master for the v0.2.1 release