edits
Merge pull request #2 from delasky/master

edits