Issue #17 Fix

I have had to make the change in a forked copy so that we can use the fix now.  Thought I would send you a pull request with the fix as it might make it easier for you to.  If not, just ignore, either way we will take your next release with the fix anyway