better regex for word seperation
Merge branch 'develop' into gh-pages
better regex for word parsing