Quick changes
Merge pull request #174 from extremezoo/Everett's-branch(6/5/14)

Quick changes