Merge pull request #1 from CruWeb/dev

Setting up stie architecture
Merge pull request #2 from CruWeb/dev

Dev
Merging from master
Merge pull request #3 from CruWeb/dev

Dev