Merge pull request #20 from oodgaard/master

Merge features from master into 1.0.x
Merge branch 'master' of github.com:devco/Trilogy into 1.0.x