added conditions
bugfix
fix conditions
Merge pull request #8 from Neodelf/dev

added conditions