fixes #10. Added option for using 24hr format