Manual merge of omnibinder PR#23

https://github.com/jeffbcross/omnibinder/pull/23