Merge pull request #519 from alanhdu/master

Expand list of allowable string prefixes