put in requested information
Merge pull request #72 from extremezoo/Everett's-branch

put in requested information