0.4.0
Merge branch 'master' into macosx