Update master to 0.1.2