Parser now works with unicode