annymous Merge pull request #2 from annymous/setup-edits