trying to fix
Merge pull request #253 from extremezoo/Everett's-branch(6/5/14)

trying to fix