end time bug fix
Merge pull request #36 from mhender24/master

end time bug fix