synced with inventory
Merge pull request #2 from jpecht/master

full update