Merge pull request #877 from rustyswayne/1.4.0

Patched issue where address type was not serializing properlty to JSON
Merge pull request #879 from rustyswayne/1.4.0

Multiple shipments
1.4.0 release