Adding --exclude-features and --args-separator options