added test
Merge branch 'master' of https://github.com/iveivan/microservices-hackathon-september-2014