Added support for latest version of trinity
Merge pull request #18 from remiolsen/master

Added support for latest version of trinity