better templates, facts defined type
Merge branch 'hotfix/0.3.1'