Added tutoriald bnf file + improved parser