Small optimization to regex
Fixed text wrapping, issue #9