Using template.Must to fix multiple return issue.
Merge pull request #32 from alexandernyquist/master

Using template.Must to fix multiple return issue.