This now works. With specs to prove it.
Merge pull request #14 from DavidS/master

That didn't work out as planned.