Enhanced ItemManager. Fixes issue #8
Merge remote-tracking branch 'origin/master'