Merge pull request #2141 from suryanarayanakb/dev-branch

"Added ids and comments"
"changes done for print"