1. Fixing variables to check the value not if it exists.
Merge remote-tracking branch 'upstream/master'
1. Fixing the variable name.
1. Do not overwrite variables if already defined.
Merge pull request #35 from bpearson/master

Checking the value of variables instead of if it exists.