Merge branch 'master' into develop
Implement and and or clause
Merge pull request #3 from fkmhrk/kiiclause-and-or

Kiiclause and or clause