Merge branch 'content_type_regex'
Closes #2