vispy
Merge pull request #1 from Eric89GXL/master

vispy