fix --option detection (currently only timeout)
Merge pull request #1 from wysiib/master

Fix --timeout, etc