Fix spec and improve readme