Comments  optimized
Merge pull request #1 from tekkla/Develop

Comments  optimized