Merge pull request #20 from MarvinT/shape

Shape update
fixed syntax errors in shape
merged shape.py