Fix Issues
Merge pull request #25 from irshad11/develop

Update component for fixing errors