Adapted it to Component
Updated README info