Added EndpointManager
Merge branch 'master' of https://github.com/rogeralsing/Pigeon.git