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

bvmbv