Fix unencoded ampersands.
Merge pull request #158 from tsteiner/master

Fix unencoded ampersands.