edits
email and edits
Merge pull request #10 from gberton/master

edits