Cleaned up comments.
Merge branch 'master' into local