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