Added improved ItemProvider from Stefan Nitz. Fixes #3