Added support for additional data types in shapes
Merge pull request #158 from brendan-ward/issue138

Added support for additional data types in shapes