implement and close #513
prep for release