add DateForm and fix #6