Fixed options vars

Fixed options vars
Merge pull request #2 from francescofiori/master

Fixed options vars