Upgrade to v 0.4