Diffusion ores 194c0e29c2f2

Accept various input formats

Authored by awight on Fri, Jan 11, 11:29 PM.