refactoring and added discovery module
minor updates, adds public box
Merge pull request #7 from dizz/master

refactoring and added discovery module