updates
Merge branch 'master' of https://github.com/chrisyao1990/backup-ec2