Merge pull request #5 from RickyShi/master

Ricky Weeks of 1/26 to 2/16