fixed character constructor
Merge origin/master