merge from astasle/gopkg

merge from astasle/gopkg