Fix to support non-ascii characters
1.0.2