Update to 0.0.5
Merge branch 'update' into update.macosx