v0.4.0

still changing descriptions…
Merge branch 'master' into gh-pages