Inventory bug fixes
Merge pull request #16 from smnguyen/master

Inventory bug fixes