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

made more changes