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

ok