quick fix
Merge pull request #154 from extremezoo/Everett's-branch(6/5/14)

quick fix