fix category regex
Merge branch 'master' into heroku