Made requested changes and Added new content
Merge pull request #229 from extremezoo/Everett's-branch(6/5/14)

Made requested changes and Added new content