Added strip components feature
Fixed extract_dir check.
Merge branches 'strip_components' and 'master'