added cases for special symbol.
added quote case and forgot to add in previous
Merge remote-tracking branch 'origin/master'
roll back ..