working
Merge pull request #62 from roaet/endpoint_dance

working