Merge pull request #91 from jttorate/master

-- import inventory module
Merge remote-tracking branch 'upstream/master'