fixes and changes
Merge branch 'character.tokens' of github.com:dandro/py_pattern_gen into character.tokens
merging branch