Merge pull request #1 from malvinyeung/updates

updates