Renamed some variables with more descriptive names.
Merge remote-tracking branch 'origin/master'