Add command line options for waitTimeout and stepTimeout. Fixes #24