Move to delegate forwarding
Fix merge conflict and update readme