LB-484: User Comments

Comments as a source fix
Merge pull request #170 from vladnicoara/devel

LB-484: User Comments