Merge pull request #21 from zhenyakoval/master

Time controls alingment