Added format parameterizing per #108