Merge tag '1.1.2'

added timer