Added failing test for #11
Stricter template creation
Added a way to verify inserted tokens while connecting them to the previous ones
Stricter parsing
Fixed the #11 test case
Merge branch 'master' into mixins