Add #extract_options\! method
Merge branch 'development'