modified to v0.0.6
fixed typo in var name
support for date_