Merge branch 'release/0.6.0' into develop
Akka style
Still not quite working
About to push to gh-pages
Merge branch 'akka-style'

* akka-style:
  About to push to gh-pages
  Still not quite working
  Akka style