Merge pull request #271 from stopfstedt/master

comments cleanup.