Imported Upstream version 0.04