Merge pull request #2 from mortu/master

Hopefully fix inventory switching for the last time.
Merge remote-tracking branch 'upstream/master'