fixed handling of OPTIONS request
Merge branch 'master' of github.com:erickg/capsicum