Update to v0.0.4
Merge branch 'update' into macosx.update