code cleaning
Merge branch 'time_period_calculation' into development