Added ordered dict support, fixed time formatting.