Merge pull request #34 from ap4y/string_interpolation_improvements

Improve font-lock regex for string interpolation