Pull request solving #93

should be T_start?