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