Fix inputs issue
Merge pull request #20 from nt1m/master

Fix inputs issue