Merge branch 'v2.1.x'
Fixed dependencies
Added DeliveryDate class