renamed variables
Merge pull request #2 from fonfon/master

renaming variables