Started #3 and fix for inigo-llc/token_authenticate_me#11
Merge pull request #9 from inigo-llc/modular-template

Started #3 and fix for inigo-llc/token_authenticate_me#11