Use nanliu/archive for download and extraction
Minor fixes