Add support for tokens inside a 'if' statement

Fix #7
Add support for tokens inside a 'try-catch' statement
Remove holding place for 'Trait' statement
Merge branch 'feature/improved-tokens-support' into develop