Merge pull request #21 from MarvinT/shape

Shape syntax error
more syntax errors
Merge remote-tracking branch 'upstream/shape' into shape
called wrong function