Time Format Corrected
Merge branch 'master' of https://github.com/123peterkim/CHP_MASTER