Merge pull request #3 from bcutrell/master

merge
Merge pull request #4 from bcutrell/Edits

Merge pull request #3 from bcutrell/master