Merge pull request #49 from pelletier/generic-input

Generic input