Added OPTIONS to request methods
merged with master