fixed merge conflicts with the old ticket-22 branch, updated readme