Encode ampersands
Merge pull request #26 from iHiD/encode_ampersands

Encode ampersands