Merge ricardo

Conflicts:
	disk.c