Fixes #222.
Updated change log.
Fixes #173.
Test for ampersand and equals sign encoding.
Updated change log.
Merge pull request #20 from cfwheels/master

pull from upstream