0.4.2
Merge branch 'master' into macosx