variables renamed to conform to convention
Merge branch 'master', remote branch 'origin'