Using new input design

Closes https://github.com/PistonDevelopers/piston/issues/602
Merge pull request #603 from bvssvni/master

Using new input design