k
Merge pull request #109 from extremezoo/Everett's-branch(5/29/14)

k