improving the factory of shapes
Merge pull request #4 from hernsys/wires-4

improving the factory of shapes