Merge branch 'templates' of https://github.com/atlesn/P-star into templates