Added a patch for issue #15