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

nk