fix bug go get
add TODO
Merge branch 'master' into docker