edits
Merge pull request #3 from marcusmichaels/master

edits