Fix component and add Rakefile
Merge branch 'fix_component'