Allow options override
Merge pull request #15 from NathanielWroblewski/master

Allow options override