OPTIONS handling
Merge pull request #1 from rolandnsharp/master

OPTIONS handling