Imported Upstream version 0.7
Imported Upstream version 0.8