Merge pull request #1 from Leithian/master

SPARTA
Some inventory work
Merge remote-tracking branch 'origin/master'
Version Bump