Made requested changes for kathy
Merge pull request #243 from extremezoo/Everett's-branch(6/5/14)

Made requested changes for kathy