Better handling of -r endings
Update README