Merge pull request #34 from CruGlobal/dev

Dev