Made variables default so as to avoid conflicts with existing values
Merge pull request #17 from tcarlock/master

Altered variable assignment with default