Fixed conditions order
Merge branch 'master' of github.com:T0ha/ezodf