squash merge flatten-strings branch
Merge pull request #336 from mikepii/flatten-strings-2

Flatten strings (squash merged)