Merge pull request #2 from avishayhajbi/master

 fix tome and date location
somtines he is crash