Merge pull request #7 from joyceyan/master

Updates