Upstream version to 0.3