Imported Upstream version 0.06