Merge pull request #93 from bvssvni/master

Upgraded
Upgraded to latest piston-event