Merge pull request #58 from CruGlobal/dev

Dev
Merge branch 'master' of https://github.com/CruGlobal/CruOrg into ie-shawn