0.3.6
Merge branch 'master' into macosx