Imported Upstream version 0.6.4