Switching master to v0.6