Fixes #1166 by adding `$options` parameter
Merge pull request #1173 from taiwen/develop

Fixes #1166 by adding `$options` parameter