Merge pull request #4 from RickyShi/master

Ricky Two Weeks of 2/4