Added special characters treatment

Added special characters treatment