Merge Cayla's changes #33 manually