Fix times
Merge pull request #62 from tenjava/redesign

Fix times