Merge pull request #77 from CruGlobal/s-dev

S dev