fix ampersand handling

fixes #114
Merge pull request #148 from jackalope/fix_ampersand_handling

fix ampersand handling