Merge branch 'enhancement/provide_more_options'

2 jobs for v0.10.1 in 10 minutes and 30 seconds (queued for 19 minutes and 8 seconds)