made changes
Merge pull request #222 from extremezoo/Everett's-branch(6/5/14)

made changes