Fix bug with else. Add proper 'else if' directive handling