Merge branch 'options'