Optimized excerpt() a bit
Merge pull request #1810 from rarila/excerpt-opt

Optimized excerpt() a bit