Fix #150, #159, #216 - Improve syntax def
Merge pull request #352 from my-personal-forks/fix-150-syntax-def

Fix #150, #159, #216 - Improve syntax def