comply with the ampm option to also provide 24hour format
Merge pull request #7 from thimios/master

24 hour format support