Accept options object
Merge pull request #1 from contolini/master

Accept options object