Resolve issue #3

Resolves issue #3

Not rigorously tested, but is working for us so far.

Also, I always forget PR's come in as issues. Sorry for the dup.