Merge pull request #5 from RickyShi/master

Ricky Weeks of 1/26 and 2/4