Bug fixed
Code reorganized
If & else parser support