Merge pull request #939 from rustyswayne/1.5.0

Adds ShipmentStatusMapper and bug fixes