Updated time
Merge pull request #2 from aojax/develop

Updated time