added workaround for the +++ bug
tweaked replace so that occurences within strings are not altered; fixed prs error
fixed wrong assumption in preg_match
Merge pull request #27 from firewizard/master

added workaround for the +++ bug