Disallow invalid input combinations (#41)
Merge branch 'develop' of github.com:cmbi/xssp-rest into develop