Merge pull request #3 from jbouse/master

Add additional parameters and cleanup template