Updated readme
Updated templates