Changed how to bind objects from different types.
Merge origin/master