added dynamic comments
Merge branch 'm-development'