Issue #3

The issue is resolved. Also added processing of special characters.