Merge pull request #1 from hetland/master

character changes
Merge pull request #1 from darcieryan/master

ok
Merge pull request #2 from zhaoruzhang/master

Changed stuff