Export internal types
Merge pull request #101 from scotty-web/export-internals

Export internal types
Merge branch 'pr/82'