Added customized component
Merge branch 'tagged'