make date & name handling more robust.
Merge pull request #12 from bcail/master

make date & name handling more robust.