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