Cleaner version of implementation using same regex to ahndle -f or -r
Merge pull request #26 from rodsenra/master

Cleaner version of implementation using same regex to handle -f or -r