solve the time problem
Merge pull request #2 from esparipour/my-branch

solve the time problem