Merge pull request #112 from CruGlobal/t-dev

T dev