Upstream version 0-2