Merge pull request #238 from CruGlobal/dev

Dev
Merge pull request #241 from CruGlobal/dev

Dev
Merge pull request #244 from CruGlobal/dev

Dev
Merge pull request #247 from CruGlobal/dev

Dev
Merge pull request #249 from CruGlobal/dev

Dev
Merge pull request #251 from CruGlobal/dev

Dev