Merge pull request #188 from damageboy/exposed-handle-compat