add holiday and day of week support
Merge branch 'new_features' into category