0.3.1
Merge branch 'update' into update.macosx