Handle multiple variables

Made a fix that allows for multiple fields to be specified and
substituted within.
Fix misnamed variable
Simplify for bootstrapping
Merge pull request #4 from jpmontez/simplify

Simplify