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