nxnnx
huge change test
Merge pull request #265 from extremezoo/Everett's-branch(6/5/14)

Everett's branch(6/5/14)