Updates
Merge pull request #1 from malvinyeung/update

Updates