Renamed some variables to avoid conflicts
Merge remote-tracking branch 'origin/master'