Update variables to close #32
Update per Luke to close #34 and update #32
Merge pull request #34 from kevinmack18/fix-variables

Update variables to close #32