don't assume first argument to be -r, fixes #200

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
Merge remote-tracking branch 'steven/issue/200'
++changes(2.3.4)

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>