Merge pull request #18 from BLasan/remove-eureka