Merge branch 'master' of https://github.com/robbyl/inventory.git