inputs
Merge pull request #50 from kurunt/dev

inputs