fixes #14: Adds --after and --before. Refactored other options to accomodate new features
Updated documentation