Fixed parsing options
Merge branch 'setup' into devel