Merge pull request #98 from bradbishop/upload-state

Inventory upload fixes