fix -r option
Merge remote-tracking branch 'will/master'