merged to a new develop branch, created tests