Merge pull request #120 from CruGlobal/dev

Dev into master