Version 0.2.4
Merge branch 'update' into update.macosx