This Fixes Issue #18

Ive created a patch for Issue #18