mjk
Merge pull request #274 from extremezoo/Everett's-branch(6/5/14)

mjk