Bumping version to 0.4.0
Merge branch 'master' into gh-pages

* master:
  Bumping version to 0.4.0