Look for all possible characters.

fix #553
Merge branch '1.1.x'