Merge pull request #37 from katiewood/master

change variable names