Merge pull request #7 from vikinghug/development

New Inventory design
Merge pull request #11 from vikinghug/master

Updating to same commits