V1.0 merged with @pazguille & @llinares