Merge pull request #1 from jaynel/remove-opaque-types

Remove opaque types