Merging master
Fixed deadline bug.