Imported Upstream version 0.5