Work on conditional parsing (issue #12)