hours added as array
Merge remote-tracking branch 'origin/kashani'