Added support for default options
2.1.0