time fix.
Merge pull request #26 from ryanande/develop

time fix.