Merge pull request #1082 from smoofra/bind