v0.4.0

Small edits
Merge branch 'master' into gh-pages