update make file
merge master with s3 branch