Imported Upstream version 0.7