v0.3.3
Merge branch 'master' into gh-pages