Merge pull request #23 from ChrisBoesch/master

update
logic change to the error pop up by selecting date/time
Merge pull request #392 from LI-HE/master

logic change to the error pop up by selecting date/time