Imported Upstream version 0.007