Merge branch 'jc/parse-options-boolean'