fixed character creation
Merge remote-tracking branch 'origin/master' into JuanB