Supplier
Merge pull request #238 from sandal-smuggler/supplier-fixes

 Supplier