Merge branch 'sb/parse-options'