Merge pull request #52 from frankiefu/master

updated components for the new changes in g-component