Conditional support finished (issue #12)