Updated to groovy 2.*