Merge pull request #20 from BLasan/remove-eureka