A few more inputs
Merge pull request #9 from jayemerson/master-working

A few more inputs