fix comment out style to check diffs easily. refs #541
unchnaged lines. refs #541
changed lines. refs #541
translate a missed part. refs #541
apply the review comments. refs #541
Merge pull request #662 from garbagetown/issues_541

Issues 541