first inputs
Merge pull request #5 from windyhack/master

Fixed inputs