fixed long variable name.
Merge origin/master