Added test batch file. Fixed problems with grammar If statement and expression