Added support for bind-shim (Closes #94)