Included PR #32 in this fix.