Moved in stuff from piston-event
Merge pull request #1 from bvssvni/master

Moved in stuff from piston-event