Fixed problem with keywords in strings
Small change in Makefile