updates
Merge pull request #33 from malvinyeung/malvinbranch

updates