updated
Merge branch 'master' of https://github.com/jbruno2/Inventory.lib