Merge pull request #4 from Internet2/develop

Develop (0.8.5-RC1)
Merge pull request #5 from Internet2/develop

Merge develop into master for 0.8.5