version fix
setup fix
Merge branch 'master' into templates