Redirected calls from GenericCharacter to hero
Merge remote-tracking branch 'origin/master'