Added an edit with my name
merged edits from Patrick
Merge pull request #5 from rhiever/phaley-master

Phaley master