Handle encoding and decoding of `+`
Spec bug fixed, remove comment.
Merge pull request #42 from hzr/master

Handle encoding and decoding of `+`