Merge pull request #27 from CruGlobal/dev

Dev