Update master to 0.0.4