Changed if statement and dealing with complex types
Merge branch 'parser_johan_syntax' of https://github.com/jhn/PLT into parser_johan_syntax