revise #582 by changing the way how OPTIONS routes are added. refs #598
Merge pull request #609 from stevschmid/598-fix

Revise #582 by changing the way how OPTIONS routes are added