Merge pull request #63 from pierrre/master

use passed options