unchanged lines. refs #634
changed lines. refs #634
Merge pull request #731 from garbagetown/issues_634

[![LGTM](http://www.lgtm.in/p/urIWCevWp)](http://www.lgtm.in/i/urIWCevWp)