Merged feature/bindfunction with master