D2 - Extend the Lex Spec - added support for conditionals and while loops, and added a new test case.