update to include error handling on number formatting and the edge case of 24 with 0 minutes and 0 seconds
Merge remote-tracking branch 'remotes/origin/master'