Merge pull request #1 from astiob/alex3

Re-fix lexer and parser to work with Alex 3