Update

Added support for -U, -P, -D, -M - See README for details.