modified rule to escape ampersands
added text decoding
Merge pull request #43 from idleberg/2.0-dev

2.0 dev