Merge pull request #933 from Bart39/dev

added/updated regexes
updated renametopre.php
added another ebook regex