Updated for 1.1.9 and incorporated some other fixes

I've incorporated one of the pull requests already made against your project and included a couple other things.  Let me know if I can assist.