Merge pull request #39 from katiewood/master

change variable names