Merge pull request #502 from bradymiller/datepicker-work_1