0.3.7
Merge branch 'master' into macosx