unchanged lines. refs #576
changed lines. refs #576
Merge pull request #678 from garbagetown/issues_576

This pull request is very simple, so I'll merge this by myself.