Fixed inputs
Merge pull request #30 from NarPar/master

Fixed inputs