release-3

fix comments from mrunge