Fix more ampersand issues
Merge pull request #24 from sander1/master

Fix more ampersand issues