Initial commit for issue #77 fix

Wes, pull this in on your repo and see if it's working for you.