9/17/2014 - Updating comments to make them more accurate.
Merge remote-tracking branch 'origin/master'