Merge pull request #25 from r-e-d/master

Remove wrong assert.
Simplify
More template parsing fixes.