Fixes for #16

I'm not sure what I changed, or if a previous commit fixed the bug,
but I'm not seeing the gsub/Float errors anymore. In fact, everything
seems to work at the moment. Shocking.