Added a string literal, closes #8
Added includes, file name in error messages, closes #10
Merge includes and string literals from 'develop'