Switch Shape to Base class (fixes #9)
Merge pull request #13 from jwhitlock/feature/9_shape_base_class

Switch Shape to Base class (fixes #9)