Removed unicode hack. Fixed #2