Improved evalution of submitted time
Merge branch 'development' into dev