endpoint support, fixes #6