Merge pull request #91 from bvssvni/master

Upgraded to latest piston-event
Upgraded to latest Gfx