I posted a comment regarding the support for single components.
In the meantime I actually implemented and tested the functionality. Seems to be working fine.
I'd like to offer my changes. I'm not sure how I to make a "real" git branch and merge it back into your stream.
Let me know if you are interested.