Minor cleanup
Added check to reduce max deilvery times
Merge branch 'master' of https://github.com/wokste/cp