Merge pull request #46 from CruGlobal/dev

More components