Issue 20

For issue #20.

Does this make sense? Wasn't able to look at the commit from a month ago. I don't know if there might be more intricate details involved but here's an attempt.  :-)