Import
Merge branch 'master' of github.com:zkessin/resource_discovery