Second attempt at #125.

That's what I get for using Notepad.
Merge pull request #833 from dsissitka/patch-4

Second attempt at #125.