Updates to options handler
Merge pull request #9 from thebelin/3-gia-twice

Updates to options handler