adding support for context options
1.4.0