Merge pull request #16 from CruGlobal/dev

Dev