Update options
Merge master