Major schematic changes
Merge pull request #10 from CruGlobal/dev

Major schematic changes