Merge pull request #61 from CruGlobal/dev

Dev