Refactoring: shape constructors + default shape definitions moved into each shape base class.
Merge remote-tracking branch 'origin/master'