Add support for multiple input types
1.0.0