Lexer and pareser separated, works with braces
Backup removed
Added file parsing
merged with 1.5