Adds Or-list
Merge pull request #13 from heiglandreas/feature/OrList

Adds Or-list