Added support for two digits hour

this should fix #219 #209 #208 #203, #209 has tests not yet included here

JSBIN http://jsbin.com/xahux/3