Merge pull request #6 from gillesruppert/master

Alway pass the options object to the setter