Merge pull request #1 from darcieryan/master

test pull request
Modified Characters
Merge pull request #1 from hetland/master

character changes