Add timeout switch to CLI
Merge pull request #277 from pcasaretto/add-timeout-switch

Add timeout switch to CLI - fixes #178