Revert "Merge pull request #16 from aldaris/master"

This reverts commit bb96f0a6259430a5dbc542c03375d668daca2282, reversing
changes made to 79e1bdb912eae434b575006c359465a3d274d07b.

fixed ampersand issue in a more general way