Granada preliminar version - Bugs fixed