new options
Merge pull request #13 from eacevedo/2.0

new options