merging KristinasBranch and master