first edits
Merge pull request #4 from jpwrobinson/master

first edits