jviereck Merge pull request #117 from tjenkinson/types