Switch master to v0.3.1