TST: for tag substition, multiple on same line
Merge pull request #574 from grooverdan/master-tag-subst

TST: for tag substition, multiple on same line