added support for nested conditions
Merge branch 'nested-conditions'