Change to fix pull request #178
Minor code-level changes to the drawable and image target bindings