Fixed issue 7 by unescaping previously escaped ampersands.