merge the changes in the openpiv branch