Merge pull request #16 from BLasan/remove-eureka