Working towards 0.2 release
Merge branch 'NetherPortal-dev' into dev

* NetherPortal-dev:
  Working towards 0.2 release
Merge branch 'dev'

* dev:
  Working towards 0.2 release