Added basic conditional logic.
Merge remote-tracking branch 'origin/conditionals'
Merged with conditionals