new options
Merge pull request #12 from eacevedo/2.0

new options