Merge gentags into cs, update README