Update README and update template