added OR-logic
Merge branch 'develop'