Merge pull request #59 from martinb3/master

Remove addl template feature, improve docs