Changing component name and tabs vs spaces
Merge branch 'refs/heads/beagle-update'