Merge pull request #23 from BLasan/remove-eureka