Merge pull request #481 from nomis52/master

Comment cleanup