remove need for specification of stop/wait type

because it can be inferred from the args passed in
Merge pull request #3 from underrun/master

remove need for specification of stop/wait type