Merge pull request #5 from teamecho/devzeli

Shape and Grid
Merge pull request #6 from teamecho/master

Updated Shape