Up to date CL.
TimeoutSauce!
Merge pull request #1619 from Lukasa/master

Up to date CL.
Merge remote-tracking branch 'origin/master'
readme fix