Added patch from je-so to fix issue #8.