Optimalized the no application conditions
Merge pull request #226 from jtomasek/noapp_conditions_optimalizations

Optimalized the no application conditions