Merge pull request #253 from CruGlobal/dev

Dev
Merge pull request #257 from CruGlobal/dev

Dev
Merge pull request #259 from CruGlobal/dev

Dev
Merge pull request #261 from CruGlobal/dev

Dev
Merge pull request #263 from CruGlobal/dev

Dev
Merge pull request #265 from CruGlobal/dev

Dev