Added support for --verbose and --timeout flags
Merge pull request #68 from stephen/stephen-flags

Added support for --verbose and --timeout flags