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

Moved over source from Piston