option to switch between 24/12h time format
merge pull