Add changes for #82