added unbind
Merge remote-tracking branch 'origin/master' into back-end-working
Fixes, improvements, optimizations; accommodation of unit-testing weirdness.
Merge remote-tracking branch 'origin/back-end-working' into back-end-working