Cleaned up some comments.
Merge remote-tracking branch 'origin/master'
Cleaned up some comments.