Merge pull request #6 from kevinliu173/edits2

Edits2