Moved over stuff from Piston
Merge pull request #1 from bvssvni/master

Moved over stuff from Piston