improve core handling of OPTIONS
Merge pull request #6 from dennisg/master

OPTIONS gaf 404