Add: Self Discovery
Merge pull request #73 from johnnymugs/master

Add: Self Discovery