added switches -u and -U

10 files changed