fixed 24 hour time problem
Merge pull request #9 from jonnyboy/master

a