Fix #11 Allow specifying date and number format