Merge pull request #1 from raymond-h/master

Embedded expressions in strings
added more test cases
Added constants, made semicolons optional