Modified treatment of conditionals in actions
Merge pull request #40 from mvdamme/fix_actions

Modified treatment of conditionals in actions