Merge pull request #2 from undido/master

fixing behind commits error
cleaned up character class
Prepping for additional stats