critical bugfix for conditionals
Merge pull request #24 from AsydSolutions/devel

critical bugfix for conditionals