Merge pull request #171 from bento-platform/features/new-discovery

Merge pull request #171 from bento-platform/features/new-discovery #647