Hey there!
Sorry for the delay in responding.
I've incorporated your fixes into version 1.4.1, which I just released. =)
Thank you for reporting not only the issue, but where to fix it in the code!