Fix input types
Merge pull request #2 from mbeall/master

Fix input types