Merge pull request #927 from rustyswayne/1.5.0

Introduces shipment statuses