template regex mistake
Merge branch 'bugfixes'