fix processing of some options
Merge pull request #8 from BarnacleBob/master

fix processing of some options