Changed commented out lines to reflect default scenario
Merge remote-tracking branch 'origin/master'