Merge pull request #19 from BLasan/remove-eureka