Accept a wider variety of input
1.3.0