Initial commit, with upstream's latest version