Added a patch for issue #51 that I'm still pondering...