Regex changes to allow spaces
Merge branch 'comma-separated-tags'