Initial commit from release tarball 0.3.6