Optionally use custom options
Merge pull request #1 from sktt/master

Optionally use custom options