I applied the patch in #14 . Patch did not applied cleanly. Please see the sc...