Updated master branch with Upstream
Fixed table day reset that lead to extra long tables