Merge pull request #7 from sammixdj/master

Fix method CheckStepKind
FIX: better keyword search in parser
Merge pull request #3 from RomanYankovsky/master

Fix better keyword search in parser