Merge pull request #8 from kobliha/Code-11-SP2

Some comments used for cleanup