Added and expanded Bug fix for Issue #10 from acey