Merge pull request #7 from nmck257/master

Improved Discovery performance
merging
merging
minor logic change to discovery activity. added unit test project.