Updated readme
Fixed issues with readme templates
Version bump
Merge branch 'master' into develop