Fixed Issue #19

Mmm...This should work