0.3.4
Merge branch 'master' into macosx