Refactored Shape, added Sample Code
Attributes
Merge pull request #2 from AlphaO/master

Some Refactoring..