This Fixes Issue #19

Ive created a patch for Issue #19