Changed a bunch of comments and imports
Merge remote-tracking branch 'origin/master'