get to work with master etcd
Merge pull request #1 from pitr/master

get to work with master etcd