Merge pull request #13 from drobbs/master

Fixed and added things to the character class