merges master to friendship, minor fixes