here we go again
Merge pull request #117 from extremezoo/Everett's-branch(5/29/14)

here we go again