Updates 8/5
Merge pull request #1 from malvinyeung/Updates8/5

Updates 8/5